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

This reverts commit 481feba74e9ce78d30eb6c42fcf15be34f9623c8.