Revert "Merge branch 'jc-submodule-in-git' into 'master'"

This reverts merge request !5046 (merged), which is causing downstream failures in Rails (gitlab!113154 (closed)).