Revert "Fixed #695: Use website defaults when used from CLI"

We don't break backwards compatibility without major version bump.

This reverts commit 249ffd1f1924433cf3d927e7ccdb186e874cfc4c.