Revert "Remove observer on dismiss"

This reverts commit faf12885589b9f5c874fdc38d139f5c24612091a.