This setter needs to be kept for BC as well