The changed test started failing on the windows bots. Reverting while I investigate. This reverts commit deb116ee.