This reverts commit 87073856a7. It didn't fix the problem, and it caused some new ones. We need a different approach.
87073856a7