BugLink: https://bugs.launchpad.net/bugs/1834315

This reverts commit e8a65003 which was
commit cd01544a upstream.

This commit, along with the commit it purports to
fix (3f8c4bc3 aka
379d98dd upstream), still cause glibc to
FTBFS on eoan as noted in
https://bugs.launchpad.net/ubuntu/+source/glibc/+bug/1830890/comments/7
so revert both commits.
Signed-off-by: Alex Murray <alex.murray@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Kleber Souza <kleber.souza@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>