This temporarily reverts commit b65966cff6 while Jim figures out why the test is failing on the bots.
b65966cff6