undo holdover bad code from previous pull request. 

maybe this makes the merge clean and easy?  I hope?