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

This reverts commit 62349ac99f3b2435afda1c72062804894da31189.