Updated for rolled-back trunk.