This class should be marked as deprecated in 2.2 and removed in 3.0.