dolphin-3.5: Attempts to correct patching failure.