thodg/got

2018-11-05T15:30:15

back out mini-commits; no significant performance difference