This reverts commit 5f254dc780. Reason for revert: Fix for SWDEV-312654 Change-Id: I45bef538273431e0dd5d85cf889a7c769c87af73
5f254dc780