Removed wrong todo, fixes #654