This reverts commit dc12cbca41. Sadly this broke the build due to some confusion about <new>. Reverting until this can be solved fully.
dc12cbca41