Change key back to int [skip ci]