Brings back 5 reverted changes related to virgo-build optimizations

This reverts commit 86688866f12b944873a73c68f4365a11c6f91fa9.
This reverts commit e9e11a4f6861d25946a77f87c7289e66c415607b.
This reverts commit 261b2ab06a0d4dd27190fdd50d50cb49426d117a.
This reverts commit 8ef64a60d097ad9bdb02a6d179e4fbd8f400665a.
This reverts commit 0a91586fee4ecdc7a876b9c9a600374c3edb816a.
41 files changed