Revert "libcorkscrew buildfix for gcc 4.8"

This reverts commit f8e699324d069bf74e72e7f76a22948dfea5dba2.