Revert "corkscrew: Fix build with gcc 4.8"

This reverts commit 3bac43af6af3883681bd7b4ec98031c7175f089c.