Bug 940250 - Fix elfhack -r after bug 822584. r=nfroyd