issue #23108: keep deprecated buildClause