Did anything really change in this class, other than formatting? Any chance we could remove it from the PR?