Revert 3311029..2d11641

This rolls back to commit 3311029348c23c15eb53d2a7bc30a1674a42c3cc.
Modify upload-template to match jQuery FileUpload