Revert "squish"

This reverts commit a6323772e4ff4f0583326d2946e6cef3ab68e71c.