This reverts commit 19c08e891d. The attempted revert doesn't fix the problem, so we'll reland.
19c08e891d