Goodbye Chronus, it was nice knowing you (2 of 2)

Change-Id: I200fd25a5f21bb19d04fb3fa5e94155e491b228f