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