Revert "track PA legacy system core"

This reverts commit 7602d755fbaf319c6c5858e565c2c86caabd2d51.
Revert "fix"

This reverts commit 33d3218a585cb6a9319cfc64c2dd8f685a440143.