Description
===========

Manual revert of WL#9252. The "worklog" introduced a lot of changes
that were modified by other features or bugs, thus simple
revert would be complicated. Keeping the new code in some parts of
X Plugin gives performance boost and increses code quality.

This patch revers whole functinality of WL#9252.

Reviewed by: Grzegorz Szwarc <grzegorz.szwarc@oracle.com>
Reviewed by: Tomasz Stepniak <tomasz.s.stepniak@oracle.com>
RB: 22856