[Build] Rolling back as much build changes as possible without breaking this PR