Removed no-pick optimization, which should be rarely useful in practice