This reverts commit 610eca7, reversing changes made to 9cfabb8. That was not a good plan.
610eca7
9cfabb8