Revert "Try to fix on the go in settings"

This reverts commit 3582cffa64f83d28d6e10d20f7205023050a419a.