Below here, I'm replacing what was removed in master but led to API errors in eclipse. Because of the inability to modify the class without breaking API, I decided to replace the old code, and fix it in new classes.