Revert revision 4742. How hard is it to understand "No bugfixes in 2.0"?