Fixed with commit: http://hg.linux-ha.org/agents/rev/d2df1e746d28