Not super easy to hook into so let's just remove it allow alternate ways to hook in and override things.