revert to original style of gem, but include 3.x patches