Offline, George convinced us that this was the wrong approach.

Rolling back r31520 and will submit a new trunk commit with the right
approach.