fixes on I-105833 for duplicate post
Revert "fixes on I-105833 for duplicate post"

This reverts commit 9047cce43916fb36981929988b6f780701136544.