Good point; we'll have to deal with that in the 2.x cherry-pick.