Backed out changeset b93c92150721 (bug 984508) because of intermittent failures
Backed out changeset 5671737e4f24 (bug 984508) because of intermittent failures