This reverts commit d7545a6b538813e88195d084f75a3e87065c999e.
The commit led to a test failure in 'tests/guix-package-net.sh'. It
also led to disagreements discussed here:
https://lists.gnu.org/archive/html/guix-devel/2020-02/msg00353.html
Reverting until these are addressed.