Revert C++11 Dependency