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

This reverts commit 077381f95af3694416d031d41cf0cd286e46bf72.