Depending on merge order with #283, we'll need to change this.