Go back to Gundo since it seems to be working again

Reverts d33a6eef3b80152bd75adc1d22dedc75eb46e67a