EENG-5145: Replace code that got removed during a merge.