Revert 519af55..623ba31

This rolls back to commit 519af55e3006acde8ae92c9601468ba462aba74e.
Messed up form