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

This reverts commit 5e846cd2b38bc350223f9e857bee967a7f4c8eac, reversing
changes made to acdefc5b01ce10bf34a012f7f26cdd75ec7f38d9.