1d23c32de1
This PR reverts commit 1d23c32de1 and fix #14204. Signed-off-by: Daniel Schröter <d.schroeter@gmx.de>