Revert "Do not trigger changes twice on mount"

This reverts commit c96e34de4dc107297966dbaf128373da4033ee11.