Revert "fixes pre race-ethnicity reconcile."

This reverts commit 7bf9f80b247e2ebe69907ff9499aecea129c14d2.
Resolved merge conflicts?