Merge pull request #1058 from RosettaCommons/revert-1054-hahnbeom/misc Revert "This commit contains two things;"