Revert "Fix reading pkg.conf"

This reverts commit 3f56689bff57e3db52ec8fd5c5f730a2aec64d3d.
Sync copy fix from ucl.