Revert "OP only topic visibility"

This reverts commit 28c29adc6baa9e84f4ba718872382ee61cd2cf28.