Try again to disable cirrus for a bit

Change-Id: Id621abf6d804990cd74f1600eeea247736e26ca0