=rem 3933: Quarantine piercing should not lose quarantine marker (forward port)

(cherry picked from commit 7c8160b)