Merge branch 'revert-14d1b52b' into 'master'
Adam Blank authored
Revert "Merge branch 'submit' into 'master'"

See merge request !2
bfd3c035