Revert some changes

Removing some unnecessary changes (some which broke tests).