Revert "hwa: fix composition type"

This reverts commit 2bb8a5db928b5ce932370b84827334c901259992.