Work even if #5931 is not accepted.