This reverts commit 36936080. It was
already applied; no idea why it didn't error out while re-applying it.