Backing out 0acfbc3b4941 (Bug 844818) for b2g bustage.