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