This reverts commit 80106333b0. This incorrectly breaks the output so the 2>&1 is on a separate line which eats failures. Change-Id: I70aa6775ce6795e8302523079a0db7933aa87693
80106333b0