Updated for current nightly (72a7730).