Update for upstream changes: Equiv DST