Committed to the source tree, and sync with -current again.