bugfix: partly reverts @94247f2