Drop backwards-compatibility code that was required to support Ubuntu Xenial.