Backed out changeset 86199339bfe8 for Linux bustage. a=bustage-fix