Revert "Fix aliasing and C++11"

This reverts commit 3c89bc7cd391289f96e57a88567a51a06539b37a.