Moving this up in priority so that we won't wind up making backports more complicated if we want this done for the 3.5 development cycle.