Revert "Ticket Id-F001"

This reverts commit 2500e3e67d93b57fb62aa1b187c1b5d565cc71f9.