I20200821-0440
This reverts commit 6dcb5e8d493e11f0bcb045cfd7e8df67105a375d and commit 337a0aaa692b794167a713d4af25ebcc86f492fb. See bug 562536 comment 25. Change-Id: I1602b479d85ed7370f708eeb0700502a899264c7 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>