Revert "Fix degrade from previous commit"
Revert "Fix degrade from previous commit"

This reverts commit 9f89b1883657934d80de50c00e010927fb1665d7.

ktok07b6/polyphony,ktok07b6/polyphony,ktok07b6/polyphony