Revert "Fixes 0.8"

This reverts commit 9033ceaf0306cd1826b5a7bf65eaa66940f748e4.