Yeah, there are a lot of oddities in this patch, mostly because we had very little time to find them and squash them. However, we might try and take more time with patches going forward to make sure things like this don't happen too frequently.
