Not sure of the value of this warning, but let's unbreak it anyway.
Merge bug25654