revert pull #404

reasons noted in pull 404.