This reverts commit 02793189. There have been some failing tests on some platforms, reverting while investigating.