revert premature settings API merge