Make things work with the latest nightly.