Revert "1.8.7 compat"

This reverts commit 8d5f8993a47929beb70b4910e51dff58a1f9f1fd.
Revert "1.8.7 compat"

This reverts commit 86acb2cebc0343200f0909f8b58fe870f1431bba.
Revert "1.8.7 compat"

This reverts commit 6b94c75477ea98675d0d23b144232f68dfee7fe3.
No 1.8.7