Put Steve's comments back in

Reverts pgarber/BUv1#2