This reverts commit 77d0035a. Reason for revert: Fixing broken test in topic. Change-Id: Ia09b6768e725af025522a25ad1289e9380b6bbbd