Revert r347491 as it's llvm counterpart breaks buildbots
am: 847d15f64a

Change-Id: Id10e5c86216fb21c6fd631ae526ecd760220b42d