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

This reverts commit 75abf658b6ab7518cc769d673240e23feb6ac657.