This reverts commit c798a5c4d5. This broke bunch of test the emscripten side. Reverting while we investigate.
c798a5c4d5