Partially reverts 4a984a8d6. Fixes #3907. Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
4a984a8d6