This should be in a separate patch. I don't mind having you commit this as a "No bug" right on master, since it's small and well understood