Revert "Fix defaults"

This reverts commit b56fb4c20163161f643dedbe54fbd091501db108.

This is legacy branch