Revert r20249, it seems the union trick works everywhere