Revert "back out 7774bc79b3ef6a80c9bc7904fc75548d57ce2955 due to bustage bug 1017073"

This reverts commit dc458aa79e9b12c64005e3b4b73dc8c0638d9843.