This is fixup for the merge commit e6bdf77e

FIXME: Find out why the results differ between release and debug builds.