Check if directory exists before removing it, again. Refs #2958