Revert "Remove all conflicting features with PA hybrid addition"

This reverts commit 19927d78e2fbd205cd189347ada99828591b2f45.