Revert "#54 Replaced defaults"

This reverts commit 6666022dfe2997476190a04679eec1baab3cbf32.