This reverts commit 82dbf4aca8. It is a follow-up to b783f70a42, which I'm reverting -- see the explanation in that revert.
82dbf4aca8
b783f70a42