Let's still test 1.8.7 for now (soft-deprecate) :)