Revert "Resolving "Commissioning Self" Issue -- 109"

This reverts commit 947f75a48c508d6964fd52d85c202289ba89e872.