Made the thing work again. And wrote an excellent commit message.