Reverting the last addition for review purpose