Add backports to gem for real