Reverting the previous patch2