Oops, merge reverted this fix.