Revert "use new default them"

This reverts commit 6ae894be12d7e50c11271bebdfea2d22f9bc43a7.
Sorry, accidently done commit to master.