Merge "Revert "Use /bootstrap-apex for bootstrap APEXes"" into main