Revert "Changes for build with no errors and modules"

This reverts commit 09cdfc4a07effa09d33be31915dbaebfb9cfdbde.