Rollback - lack of emplace support for std::unordered_map with GCC 4.6.