Revert "Track own system core"

This reverts commit 424d58ba5ee0396f41b0277b54ace0f949efe569.