Merge pull request #1332 from marcel-blonk/PLFM-2751

revert back to use configuration