Backout bug 962791 for causing various regressions. a=lsblakk
Bug 948326 - Actually address review comments in bug 918135. r=cpearce, a=1.3+