RF-12962: reverted part of the cleanup RF-12900 to bring r:actionListener back