This reverts commit 47d526d6. The commit is failing to build on some platforms. Rolling back while we investigate.