Revert "Merge branch '0.8.7'"

This reverts commit 06781943a748a8e2949848e455786e225434d573, reversing
changes made to ae7350f7f5f10de3e3c1a034fa943cadca94a2b6.