Looking at #2419, we can probably fix it when we look at that. 
