This fix was part of the previous commit; here the old file and old class name was removed.