This reverts commit a2982a29. Buildbot failure that motivated the revert looks unrelated.
mentioned in commit ca68a14e