Removed unused import of skip since it breaks in 2.5