I swapped the two implementations around in the file, so the diff now looks a bit wonky.