Backed out changeset cbed4fe28c54 (bug 858084) for talos bustage.