Revert change of default destination subdir

* This is configurable
* We're diverging from upstream with similar changes