Take 2, after CLOP

bench: 8314478