This reverts commit 33e300e32d. CYNGNOS-1677 Change-Id: Ia4a9d192fde03152d308f7a93f3fe6525cb57c7d
33e300e32d