Revert build system.
Fix retry.