updated to compile with rustc '90d06ecf6b'