Revert "Track own system/core"

This reverts commit de4b77adea55089c0aac8002a80eeb3a5dca4534.