Revert "Merge branch 'master' into v0.9"

This reverts commit 68f75ac1e795fac619ef1c4613ad858933ecae98, reversing
changes made to 6fd000231d7665395b11f75a471ca65b69778a04.