Revert "1.1"

Accidentally merged 1.1 branch prematurely.