back out 242bb2279283 from bug 928222 on suspicion of causing bugs 930495 930479 930428