revert the non-square shape changes.  Test failures locally involving
failure to compare float16 arrays.  I don't understand.