revert merge kerfuffle