Sorry, but I don't understand what you're saying. Are you proposing a smaller set of changes to fix this issue, or are you saying that update forms are still broken even after this commit and that we need to move line 184 out of the if-statement to fix them?