Partial revert of commit ee917996. I can't reproduce the error locally, so let's revert it to keep the bots happy.