This reverts commit 9031aa6789, which got applied unintentionally, and should be addressed separately.
9031aa6789