Revert to legacy