gcc 4.8 fixes
attempt fix
Revert "attempt fix"

This reverts commit e635a03b30e218c46ceebb9928e87c04392c922a.