Backed out changeset b4db16c3fc30 (bug 853709) for build bustage. a=backout