Switch back to legacy