Reverting tail node change to fix build

Fixes #337

A useful change but need the corresponding tests to be updated and also properly publicised on the mailing list as it is a change in behaviour.