I submitted #7160 to fix this