This isn't a refactoring we did. We don't remember even touching/looking at this.