Revert "Fixing infra script to generate all the necessary files"

This reverts commit 1fcc962938d2758b48d6d6bf239b099afc7b5a8b.