Bug 833610 - Backout the second half of bug 832025; r=ehsan