revert-commit (more fixing would be required)
Authored by: widmfeli 2019-05-19
Parent: [r417]
Child: [r419]
