Revert "C++6"

This reverts commit f9359a8753c0a5813896ef570b55cf138173288c.
Revert "Revert "C++6""

This reverts commit ed4a1f5283f18eedc4a762bfb3f48c46cdaa18fa.
Revert "Revert "Revert "C++6"""

This reverts commit d6d6aa2c15daad6542ab5b3d492de02514837740.