Be more careful in how we remove the PLCONF_DIR, especially for systems