Back out bug 1067505 for some kind of make package failure.