LP1823041 Remove unintentially merged code blocks