This reverts commit f5d003d1.

We decided to postpone this change until a later release, in maybe a
different shape.