Reverted a couple of changes

Yep yep