Revert accidental merging of settings switch fix.