Indeed.  So we can merge this, merge #2010, merge 1.2.x over to master, and then make my suggested change as part of that.  (It doesn't really matter, but that feels like the path of least resistance...)