AGPUSH-1090 : Revert to submit type

@lholmquist Can you check this ?