Revert changes done for PLFM-803
Merge pull request #295 from eric-wu/develop

Revert changes done for PLFM-803