I would like this to be part of another pull request. It should be straight forward enough to do that right after this PR landed.