Add back in 5.6 stuff that got removed from last commit