oops: reverted commit 1308 (should happen on delwin-merge branch first)
Authored by: mukau 2019-11-05
Parent: [r1308]
Child: [r1310]