The change broke SetupWizard and probably other apps This reverts commit 059f8f93e6e89f80dfb85cfdbcd3bce64c7b1e2c.