iPod Touch 8GB, iOS4, and battery life

When I upgraded to iOS4, my standby battery life completely disappeared, such that a full charge wouldn’t last even 8 hours on standby.

Some googling suggested that the newly always-on WiFi was to blame. Now I keep Airplane mode turned on unless I need to connect to the internet, and I have my battery life back.