Revert "Make sure to dispose services supporting the XComponent protocol"

This reverts commit 4cacc6080e61374fd573fffb3bc2a54968c1b61a.