Updated core code hack to 2.6.4