Revert "merging head from mashery" as there were merge conflict annotations that got committed

This reverts commit 4e7b6b63f070ee20c70d7edbb2952e663a3c5703.