Fix optimization in previous commit to work for new repo.