Add 1.8.7 back to the matrix as optional