This reverts commit c9d1a9f8c63a1ddea170fd2ccef576eabecda9e1.
Reason for revert: This commit is impacting USM on non-controller nodes in multi-node deployments (standard and storage) and according to the owner of this commit, this change is not needed and does not fix the issue it was intended to fix.
Change-Id: I74ce9e316a1d0806bdc32710e486fcba05538f90