Revert part of 10c0e75f8adf735a6e6924af5ad2ecdd9e1604cd, may have been causing lockups when removing plugins