Setting things right after the previous commit disaster