Partially revert "Forms: Disabled fields always get new default value (BC break) [Closes #981] [Closes #961]"

This reverts commit 1e36069c3ee65c218414b5a409eebf57c2e059dd.