OPAL-1477: Reverted some of code inspection fix.