Revert "remove the || true"

This reverts commit 4a62910ce576d6441b5e827d5279b9d2ff2317bb.