This is a backwards incompatible change; there is a more complex change that just stubs this stuff out that may be better that we may need isntead of this commit.