Revert "reverting back to prev condition"

This reverts commit d6136238da7d4404fbb71856a7bdcf72feed0bbe.