Doesn't this reintroduce #392?