Revert "This is NOT legacy"

This reverts commit 5bd6d4f8c81583cbc43485bd3be60f7884d35664.