Revert "Default values"

This reverts commit d4d5de2d9adc8ca3c26b003b350bcec1744c8bb0.
Revert "Revert "Default values""

This reverts commit 3697beb4c553ecc7a864aee7bdaec751a0676bec.