This reverts commit 92ebb4d245. Bug 2487534 Signed-off-by: Konsta Holtta <kholtta@nvidia.com> Change-Id: Ic8db42d2da47284c00b23c786830176b7a2dfe18 Reviewed-on: https://git-master.nvidia.com/r/2001922
92ebb4d245