Do clearUserPref if required when reverting changes, fixes #3