Same nag I made to @larrybradley re #2098 :)