Revert "C++11 Fixes: Part 1."

This reverts commit 26bdbaf80f620bdb4f86f12759b4a01de0ce9500.

Better fix will be committed in a moment.