Is there a reason this class was moved?