Reverted changes to disable code analysis