Refs #1579. Putting settings switch back.