Temporarily pull in ehmon fix in a branch.