Revert "Updates for mr1.1"

This reverts commit 96965476a8eddbb6218dbe59f87acde0117f1507.