The ruling on tawaf from inside the Hijr?

Question:
I am a pilgrim performing tamattu' Hajj. I performed the tawaf and prayed two rak'ahs at Maqam Ibrahim, then performed the sa'y and completed the rituals of 'Umrah and exited the state of ihram. Afterward, I learned that performing tawaf from inside the Hijr of Isma'il invalidates the tawaf. Since one of my circuits of tawaf was from inside the Hijr of Isma'il, what is the ruling? Does he have to repeat the tawaf, or the tawaf and the sa'y? And what is obligatory for him?

Answer:
The ruling is that the 'Umrah you performed is not valid, and you remain in your state of ihram; you have not exited it. It is obligatory for you to put on the clothes of ihram again, just as we said in the question before this one. You must go to the House and perform seven circuits of tawaf for the 'Umrah, because your first tawaf was not valid as it was incomplete. Then you perform the sa'y between al-Safa and al-Marwah for seven circuits, because the sa'y is not valid except after a valid tawaf, so your first sa'y was not valid. Then you shave your head or shorten your hair, and by that you exit the state of ihram from the 'Umrah. Yes.