Revert "PDK-9498 : Addressed review comments"