eddyb: i took a look, just not sure what this is fixing