Gradle 5.0-rc1 enforcing single publicHeaders

The latest nightly broke us irrecoverably with its change to enforce a single publicHeaders for native builds. I don’t see #869 resolved so is there a different solution to this problem?

We have far too many projects and files to update to make this work with a single publicHeaders without a solution for the reported issue.

Is there a way to disable this enforcement?