Revert "Merge tag 'v0.8.2' into HEAD"

This reverts commit d6198c1de69ba06eaa22d6d1f3ce1e645896c831, reversing
changes made to 353560b47aebf06b4feae3ade663014e11d8a560.