This reverts commit ea5aa7a3fe5143774b2d3944f4f932d610ae23d7. The issue has been fixed properly in Idafc26a739df1831d04ea2fde4625e8f9ca1a0ae Change-Id: I8275c11660af6cd03907970dea020897b66ceaa3 Signed-off-by: Alexander Winkowski <dereference23@outlook.com>