Hajj to return to pre-COVID numbers