Follow up on "Build failure for latest beta release (21.5 (beta32))"