I suppose you're proposing this be replaced by (something like) the version in #1985 when that is accepted?