Revert "Go to legacy"

This reverts commit 7dcf38967f7c60d0bf82c007db4e36d88e348272.