chore($handler-cleanup): Simple uploads working again for S3 XHR & form handlers #1157