Revert "Properly fix setting of defaults without conversion"
This reverts commit 62b4232a1de6ef854437a98bd2c1c863635923a2.