Apply ElvishJerricco's Persistence fix.