Revert "track system_extras(again)"

This reverts commit 500658d0bf394b99d86c858c68acbe8d7259225e.