Kepping the same for the moment, as this PR is just about moving things about. I don't want to risk breaking the existing behavior.