Revert "Merge pull request #13012 from the-control-group/bugfix/check_li...

...bcloud"

This reverts commit ec0044a7e2ec553f637febc7d83463b6abe40fbf, reversing
changes made to 680660cca35264eb4ee85509cd23ce023c839ca7.