Revert removing length counting