This line makes me sad. Soooo glad for this refactoring.