Making the changes caused many tests to fail. Can fix this as another commit. Not changing it.