Bug 877653 r=dustin