Revert "merge updates"

This reverts commit 970575147072936eef226e528cdb7bc9c37367ab.