re-commit r66920 (which has been backed out in r66953) I may have more luck this...