Bug 865837 - Backout 986bf2f25745, ps output