Hacking to get this to compile with rust master 5/25/14