This was merged after the foobar commits