Work in progress
Revert "Visible pref changes reflected immediately"

This reverts commit 78c5f5d40ba42643fcd4b291065a4eb1cd39c665.