Revert "Merge with Sugarizer handling"

This reverts commit 9702d28312b76046a72ea50ae1934cfd2d95e7c7.