Revert "Fix options changed notification handling"

This reverts commit 6c98db966f95ca87bc7235fe72244bf8a1379245.
Unit tests for OptionsImpl and command provider fixes/enhancements