MOHAWK: Use original stack ID mapping for Riven