Removed the TODO since this is what I've just commited.