Ben Gamari authored May 30, 2019 and Marge Bot committed Jun 04, 2019

This fixes a few vestigial references to `settings` left over from !655.
Fixes #16715.