Revert "Merge branch 'test-version-1.1' into test-master"

This reverts commit 9dd0c5b09633595e0a20710df2bac26709b181e7, reversing
changes made to 84e7ac26aaf9f0e8c9b84feb8e9c53224654099f.