More manual edits to fix bad merge on master. This gets all tests
passing again.