Fixed another bad commit
Reverted more from the bad commit.