Merge "Removing bogus check to permit on-host debugging."