mh that sucks. but i guess you are right. the rest of the cleanup is doc and can go into 1.1. 
guess i will revert the BC break and do a new PR for it