Revert "Merge branch 'bugid-50896' into dev"

This reverts commit 30c3ae61e7e6bee260be67d78c8478207bd34b50, reversing
changes made to 36ff8ebb839cc3b29c42dbfa3e2d7b69e398146a.