Revert some CPP2011 related changes.