reintroduce the shortcut evaluation removed in r108403 and r108405