Bug 878607 - Backout aeb89583349d (bug 887814) for breaking bootstrap on MacPorts; r=jwatt

DONTBUILD (NPOTB)
Merge inbound to m-c
Merge m-c to inbound