Revert "unfinished gcc 48 fixes"

This reverts commit 2fb4afc6e9f369fa1e328ddb8cf9319dc4fd7f51.