Test revert

Reverting 2 commits that cause issues with environments