This reverts 61ddc3d3 to reapply 91eda9c3 after fixing the " |& " causing failures on windows. Change-Id: Ib646c803b2274f0f24f9a8932de7aa97003529c5