This reverts commit 071c39df. One of the new runtimes tests causes a failure with MSVC, so I'm reverting until the test can be fixed.