[#XDSB-102] Dynamic de/activation of XDS components | reverted irrelevant changes