port #6309 ustack helper changes back to 0.10