disable features not present in upstream