Should fix the ppc crash. Cherry-picked from fcf7831c917acc2eff0bb20fb622839e22282699
Attach a file by drag & drop or click to upload
