Undo Ubuntu 18.04 compatibility changes

Once Ubuntu 20.04 is released, we should undo 5525f77d as Ubuntu will then include dependencies recent enough to support the features we had to stop using to be compatible.