Revert "optimize linking to submission"

This reverts commit 3d3ddba1ed29cbd9086b10523cd8534e7ee14589.