This reverts commit f43859b4. This is not NFC, so I'll try again without that mistake in the commit message.