TODO: Double check if the path fix patch is really not needed anymore (code has been changed upstream).