optimize 5a82d750 for unarmed builders