Nightlies failing because of this one

This MR broke bob.ip.gabor!12 (merged)

What needs to be done is to cherry-pick these commits 8cf2dd55 and e9e7bbb7, and merge them to master