Unreviewed, try to fix the build on recent SDKs after r226274.