mrc's first pass revisions
Revert "mrc's first pass revisions"

This reverts commit 2d0c5d54e2f45617f34c4c1cc72fbd28d09cbf1f.
mrc's first pass revisions (on the correct branch)