Bug 812638: backs out bug 480647 (part 6) r=ehsan