This reverts commit 19c08e89. The attempted revert doesn't fix the problem, so we'll reland.
Attach a file by drag & drop or click to upload