Revert "various: compilation fixes for gcc 4.6"

This reverts commit 667b95e77116fa6b481992580ed723f8e666e256.

Reason for revert is that Andrew Dodd says it is not required.