Credit goes to Mario Kleiner, who bisected this issue. BUG: 423014 (cherry picked from commit e6fb6ff5)