Refixed 12802 (regression)