I should remove this comment, it is no longer correct. 
@tarcieri should it be?