Cherry-picked only writing out the GOFT