Revert "Merge in jonathanj's trac-0.12 work."

This reverts commit 93a1a0c118654af03bcc9fdc9f1a332b4ad7ec55.
Pull in jonathanj's updated work.