Revert everything related form attribute changes, refs T851

- rUSHd07cf55e07c9aaf1b70eff8c7168e4b307c839c3
- rUSH0008d5c6811dca8d7ddafc74cb1911a97833e701