Comment 20 for bug 347729

This thread seems to have gone quiet, but the attached push_back_once.patch seems to do the trick for me.