This reverts commit 4430178b29. It's time to put this back before the cert expires and before we go into Beta freeze. Hopefully the odd issue with armv7 qemu guests having a time behind real time is not still happening.
4430178b29
1e712cdc30