Teambuilder: Re-implement EV locking.