Fix for #317200

lrytz/asm/abc3759d2d

This commit should be in the next ASM release, so it does not need to
be cherry-picked on the next ASM upgrade.