I'm not doing anymore refactoring in this bug. It has to land ASAP and that will only drag out the process.