This reverts commit 0f57d855, reversing changes made to 65af4302. I'm missing human time to solve errors or verify that they're harmless...