parts of a patch that likely won't work
get rid of broken test