Fixing bug caused by last merge: the original class has been renamed and our code wan't being used