Rolling back previous commit

Too many environment scoping issues to solve right now