Revert Fix GCC 4.8 boot