This reverts commit 42bd3c08. Reason for revert: Causing breakage in QSPanel and monitored tests. Change-Id: I99cd110f58eb8f4c5faa6f7bef41e820654ea9df