This reverts commit b33e0b8b. Reason for revert: CI failure deemed to be a fluke Change-Id: Ia804d531092921e4ad090740420c4a4e02e6ff00