Removing ActionButton usage (see also bug 1053704)