Forward-port 1e6 -> 1000000 fix from master.