Moved to trunk in r71634