This is similar to !4330 (merged) and !4334 (merged), which fixed the main library but missed the demos.