Revert "Merge updates"

This reverts commit 0478754c9bd3734dfae875a230636a7d2b9d7ddc.