Revert "Try a fix for CALI shapes"

This reverts commit 9e7dbb4b4ffddc02e858c273c5f4c1c03ff2ab6a.