Revert "Updating Cirrus to pick up I2638b695"

This reverts commit 59b3f5a1b13da123ffb4888ac333ffe7bfc0a633.

Change-Id: I0d3a3a1ecca53112f3ae856f671d1419e957dedd