Removing this heading-big change as it effects more things
than it fixes