Backed out changeset dd73fa918f95 (bug 1055728) for linux build failures