backport fix for too much payment receiptery, RT#9723 / RT#9856