Reverting inadvertent changes to topology code. Fixes #78