[llvm] Revert #140650 and #140505 (PR #140973)

[Snehasish Kumar via llvm-commits]

snehasish wrote:

@ayermolo It would be good to have the modules build as a bot if you care about this configuration. 

https://github.com/llvm/llvm-project/pull/140973