Fallback to base per #5092