This reverts commit 52ff4368e5. Reason for revert: SWDEV-365075, SWDEV-367163, SWDEV-367164, SWDEV-367173 Change-Id: Id2924c60e46e9879038ded358f777c71cd95b2c1
52ff4368e5