am 7b487466: Clean up Global settings stragglers.

* commit '7b4874660e94685b76828e1f93b651ac38742bd7':
  Clean up Global settings stragglers.