Revert "MANUAL Merge w. Michael's Changes. CURRENT FINAL"

This reverts commit fc696a6b3370294d2a006a8957ed698c6a0d99ac.