Missing a TODO? Or Explanation why this is commented out?