Reverting a bunch of changes, will leave for a seperate PR.