Backing out bug 916052 (2557b51a47a0) for build bustage on linux/osx, r=bustage on CLOSED TREE