Should the `|| true` be removed here?  I assume that was for debugging.