Revert popup buttons changes

The popup button changes requested as RM-2148
are causing many regressions like RM-2148 and
few more.