This class should now work in 2.3 or 2.4+ without any change.