Merge "Revert "Stop using versioner."" into main