Removing unnecessary dependency that breaks backward compatibility