Good point!  I will revert and revisit this whole commit!