Correctly disable e-p-f-s conditionally