This replaces the existing Legacy/* support with a new approach that