I guess I will commit this patch since I can not just upload it to github anymore :-(