Revert "Merge branch 'not-square'"

This reverts commit cb667bde283e4a798242e39ad666e8ee0bc0ef5f, reversing
changes made to ed00bb47093f3860b67b3e0201eba0786f35a3f7.