This TODO has been around forever. Are we going to do the check or ... ?