Simplify previous commit and remove some debugging.