CLDIDE-1954: Temporary remove problem code block