Revert "Fix a bug in sonata"

This reverts commit 2997913920724f3a64012b294e6d27da7c85e1d4.