Backout expandlibs part of bug 812179 for breaking bug 603370. r=me