[OC] Stop doing this.