Revert "track our system/core"

This reverts commit 0511301e3eecf2865451c2d4da90d58df4c853f3.