Do pass2 only once.  Closes #650

A temporary fix until we can find out why it's loading the
same thing multiple times