Candidate fix for build failure.