Revert "compatibility patches for gcc 4.7"

This reverts commit e492739cb86c97d42dc256a3b94be587096409ef.