Revert "[#666] Correctly handle attributes on form upload to not include redundant name attributes"

This reverts commit 805859a9aa396b2f12dc99753dbc06cc4dd954a0.