Revert topology threading change - EUCA-6479

Threading change needs to be isolated from general component threads.

EUCA-6479