bug 835533 and removed TODOs