Reverting security's change to cominfra code