Revert changes that somehow worked their way into the code (patch
applied on github that was not pulled to the master.  Grr.)