Revert "Use package-user-dir whenever is possible."

This reverts commit ae214cc0f57ae7182c6c537d269f15c54f2f426a.