Reverts commit 43175fb. Pkg components no longer write vars in Makefile.