Vinay | Reverting commit SHA71c507ec6607f433b71d93793daee39001432bbd