Revert "Split into two versions"

This reverts commit 4bbe443c75b55e2f00c8ebcd8e9d5c88b8467bbb.