This reverts commit bacf9cf2c5cdec3567580e5030c4c82f42b3d745 and reinstates commit 1a9bd5b81328adf0dd5a8b4f3ad5949463e66da3. Reverting this commit did not appear to make the problem go away, so we can go ahead and reland it.