Revert "Merge defaults"

This reverts commit 73d4f1ec823ff3096762f7b02d4e80b75dbb1db9.