Revert to trunk version