Possibly, but it'll get cleaned up in the follow up #1142 which changes this.