No need to do it twice. Also this uncovered a bug in systemsettings CCBUG:465510 (cherry picked from commit 4d55735c)