[Do Not Merge] testing revert of 6641

I'm just testing if the issue was the Bundler API issues of the last few days...