Bug 844779 - Revert 19eafdcdefe3 for SPS-related breakage r=me