#24 turned the patch into a hack