Added in #915 as a TODO