Pretty sure I'm not just missing it. Wasn't sure whether to piggy back this on #794 review or not, I can create a PR if not.