Revert "Updating Cirrus to pick up I2638b695"

This reverts commit ed65bd23dba44a93ef0d5f19fe313dbc392be6c7.

Change-Id: I4bd127b31c997fd8d55e3deedf424cfc4314d959