Reverted a bunch of other changes that shouldn't have been included