This reverts commit 8a4390dc. (The reland did not have the bugfix, just trying to get more details from the buildbots)