Fix errors left over from removing sugar
Revert "Fix errors left over from removing sugar"

This reverts commit 3b903e7de47069c61a2b608274263cbb9f9e8c5e.