Revert "Correct some functions in base-image scripts returning bool value"

This reverts commit c63c90950b7afed843b73a80b36b97e6126c1c8e.