Fix patch for GCC 4.8 and remove art patch