(bug 44883) partially reverting Change I694e7ab1 to fix buttons

Change-Id: I123a093805509d89be2f79f97f7c6ae327aa172d