Merge "Revert "Change argument types from FD to PFD""