Add back in Trinity kernel after 4.2.2 tag merge