Merge pull request #2798 from RosettaCommons/everyday847/fix_two_bugs Overzealous merge included two bad changes