Revert "Merge pull request #2393 from andymckay/deux-versions"

This reverts commit 46abc12c86e5c299150ce7301862f93f8e11d8c3, reversing
changes made to f04660129d2be76ea6ef310f409e304ebfbbd3fa.