Backed out changeset e40466e428dc (bug 853301) for breaking cross-compiles.