[BISERVER-10720] Revert changes in commit b43f60a that caused advanced upload settings to break.
Merge pull request #1550 from bytekast/BISERVER-10720

[BISERVER-10720] Revert changes in commit b43f60a that caused advanced u...