Add a last-ditch effort workaround for Bug #1263233 in case our workaround in 1cbbf166 fails.