reverting previous push (I'll log on to the test server and try this again later, but it seems GCC 4.4 gives different uninitialized warnings even on different individual machines.)