Revert r191586 and r191695. They cause crashes when building with
-relaxed-aliasing.