Revert "BRANCH 4 updates."

This reverts commit 4304df19fef5459d93cf1a1b81884818dd72705b.