* Revert back 'Duplicate Code' fix.