This reverts commit 243284f998. There are some issues in how the JS tests interact that I will need to figure out here before this can be merged.
243284f998