This fixes a regression from c360a0c2 that removed all observers instead of the one specific that was intended.
(cherry picked from commit d889f248)