removing cruft from a not-yet-merged change...