Sorry, this is a 2.063a regression fix I found. I forgot to split this change into other commit.