Restore join finish but mark for deprecation