Fix broken legacy