Bug 958908 - Remove usage of deprecated/observer-service