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

This reverts commit fa46b51feb28b522148573e7ed0400c2578aca06.