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 c6cb9b0d3a47347b8f48b5cc8b0e18130187a8f4.