Reverts the core changes of 5b47f47d, which was a horrible mistake and could not possibly have worked with this branch.