For reference, this will actually be fixed in 2.066. Might be worth cherry-picking this specific commit once we have rebased ourselves to 2.065.