Fix countdown again

Change-Id: I2995367c25f2b36ffe8ae8d99ec60d58d4879296