Undid all of the 1.1 neverbeen changes. To compensate, I created a new "1.1-Neverbeen" branch, where this code is still located.