Go back to kisielk's version