Revert 5716086c6.
Revert 9a14b4c4c (i.e. restore 608c70a).