Bug 995065 - Backout bug 947227 on the release branches. r=jgilbert, a=1.3+