This change makes the form work in real life but fail in tests.
Fixed tests, deliver deprecation.