I'm not sure we want this change, and if we do it should be in a separate PR