Merge pull request #1572 from RosettaCommons/revert-1571-sofibali/sofia_summer_work
Revert "Sofibali/sofia summer work"
This merge caused the following problems:
- The PyRosetta C001_Carbohydrates_Demo01 unit test failed to run.
- Several integration tests were complaining about the INAME line in the changed params file (a typo).
- The carbohydrates integration test failed to run.