Revert "Fix aliasing and C++11 issues."

This reverts commit edf6043399f0f94073ed21599cc8f911e8b410c5.