Eelco unplugged: take 2

bench: 4297814