Try to fix inconsistent release manifest generation; Take 2