Backout some possibly incorrect requires versioned dependency