Backed out changeset aa47acfdbdae (bug 986992) for packaging bustage.