back out bcf59703dca1 due to bug 1037267.