Revert "Fix #18 improve default behavior"

This reverts commit 17b577b6540b641b79dee94667ccbc120b3ff9ed.