@skyebend had put in a PR a few years ago, but we didn't want to merge until 4.0, and the PR was out of date by then. I think it's still worth doing.
