This reverts commits f05bdc9412 and 856ae5e6c7. This broke all sorts of things. See <http://hydra.gnu.org/eval/102058>, for example.
f05bdc9412
856ae5e6c7