Reverting more changes to reconnect-2field

This version seems to work, but doesn't have some
external phi terms. Newer version moved to 2field-bc