I rebased this code to remove a bunch of merges and reverts.  In the
process I missed some changes, mostly deletions.  These have been
added back in and manually verified against the original PR.