Fix yet another aspect of the build breakage caused by r216949