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

This reverts commit c7cc23ba25b4d08b71f76739a211f20e0373e084, reversing
changes made to 81f155bf711e377a4a471726ecc87a48cd2b134f.