And fixing another change that I reverted.  My git-fu is failing me.