* commit '83f39b510d6bd8237018500496aa8673b15e9332': Revert some new APIs for restrictions provider
f908b61abf