TMDM-7192

Revert commit on wrong branch (was "Code clean up in browse records").