Tail support reverted, beginning reimplementation