[19:12] <rick_h_> hatch: aha, found a left over timer in a test still. Doh! 
[19:14] <rick_h_> hatch: https://codereview.appspot.com/8488043 has the drive-by if it helps the tests at all.