Committed in r802645.