Rewritten, simplified. The 8.5 requisite means that we have extended
requirement syntax allowing us to jump the major version barrier
without fuss.