Revert "Revert "track system_extras(again)""

This reverts commit ff50ee6dc5cf162b3c52ff9e078ef1f0859efa48.