Regression in e3e48b0012. Thanks to Shai Berger for report, reproduce and suggested fix. Backport of dd1ca50b09 from master
e3e48b0012
dd1ca50b09