This class is not necessary anymore in 2.10.3