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