Bug 890516 - Backout patch from bug 614825. r=bz