Now that 9.12 is branched we can finish this.

rt46404 ready for review.