Did you run into something while testing that made you want to change this? Seems a bit odd again to have this mixed into this PR.