Revert "Track own system/core"

This reverts commit cfd8cbc5b7358c730abba78b7d222b479ac23267.