Update golds, comment out all the horribleness that we were doing to the client outputs, and do some sane things instead. Finally, disable rekey since that is known to be broken right now.