Does the same ruling apply to someone who intended the Ifadah circumambulation but forgot the intention for the Farewell circumambulation?

Whoever performs the Ifadah circumambulation (Tawaf al-Ifadah) without intending the Farewell circumambulation (Tawaf al-Wada') along with it, and then travels, there is no sin upon him, and his Ifadah circumambulation suffices for the Farewell circumambulation. As for one who performs the Farewell circumambulation and travels without intending the Ifadah circumambulation due to forgetfulness, his Farewell circumambulation suffices for the Ifadah circumambulation according to the majority of scholars. However, if one intentionally omits the Ifadah circumambulation and performs the Farewell circumambulation, then the Farewell circumambulation does not suffice for the Ifadah circumambulation.