return to mainline muffin -> 1.7.3