Revert "First steps needed to get better workgroups."

This reverts commit 90f5e881027418494cc5f7564c6d5dca726d12b9.