more breakage from bug #4116 commit