This reverts commit 57882fe76e. This reverts commit 74b0ac571b. Breaks various build bots.
57882fe76e
74b0ac571b