Backout for bug 933918. r=backout