Make sure defaults values are actually used. Fixes #3974
Revert "Indent better"

This reverts commit a431bfc9e698c753d9a54218af9076184deb6251.
Fix indent
Merge pull request #1328 from wagonza/master
Merge remote-tracking branch 'upstream/master'