baseband update in 4.1 responsible for battery drain in 3gs?

even having deleted all email accounts, then done a clean restore as new, and turned off all notifications and push, and not having downloaded any apps, the battery is terrible, having reverted with the same state to 4.0.1 its terrible, and using a brand new download of the FW and upgrading again the battery is awful.

could this be the baseband causing this and can it be fixed if this is the case or do we need to wait for an apple update?