Reverted tinkering code in dfpLoader