RECONCILING THE GAMMA-RAY BURST RATE AND STAR FORMATION HISTORIES