Comment 4 for bug 1412919

Sounds like you're way ahead of me. ;) I'll get part 1 of the fix in today for review. I'll hold off on doing the component specific recipe changes until after we've worked out whatever issues come up during the review.