Revert "for ticket 12345"

This reverts commit c32260485dde8efc50e9ec911ec09e9b977bd640.