Revert "[MT] Fix some trees drawn even after the feature was destroyed"

This reverts commit 4cb30edf19d4c89bdaef5cdb038132453f4ab9b1.
Revert "Revert "[MT] Fix some trees drawn even after the feature was destroyed""

This reverts commit 3fc6ebb0496b2e82f8e6ac027de2e496f7ee69b8.