Revert "slice and dice"

This reverts commit 279d4f61fe751219da3ece916e0d02bdf204389d.