Revert "Doesn't compile yet, but there's a much better way to do this..."

This reverts commit a2cdfc186e940236575164f1185fcca56235de8a.