Backed out changeset a87f1f662a6c (bug 939472), a=bustage