I just tried to remove it from master and it seems to work just as good.  Anyway, this can be done later.