Fixed a bug.  Refs #7322.
Merge branch 'feature/7322_remove_tof' into develop