Revert "partial merge"

This reverts commit 6b2f070976a40171c0a2dc4a3a5082a228f2af43.