Make feature optional, opt-in