Also revert private lib changes in da2cea569c8bcda165729b0a29555ab9ef320f76 that seem to break some installations. Fixes #27565.
Also revert private lib changes in da2cea569c8bcda165729b0a29555ab9ef320f76 that seem to break some installations. Fixes #27565.