Revert "0.8.4"

This reverts commit 16a367c7fa5c9c32e34dba29196753611fadbb6d.
0.8.4