Revert "Pie controls: Tweaking UX for pie service (1/2)"

This reverts commit 29c7bb3e9f8d9caf0e85779c21a9a2bcad5ca97d.