This may get caught in a merge, but don't miss this class change.