Revert "1.87"

This reverts commit a83bee897e736ca5b0ccec55a68b2ed3078c290c.