Revert "Fixes some major issues in v1.1"

This reverts commit 723a411d232b8ab3f60932d3af4b3e1e86224281.