Revert 5dd7285..e6f461e

This rolls back to commit 5dd72852aa972ea47f3d3590e8aa659b2d250c96.
Revert "1.1"

This reverts commit e6f461eeb95ea17648e5d439919af6af3671e846.