Why was this removed? It seems you did a git merge or rebase from an earlier version and lost some fixes added in-between