BUG:  Confusing situation specified.  Changed so that we always do the registration.
BUG:  Confusing situation specified.  Changed so that we always do the registration.