Revert "Integrate earlier changes"

This reverts commit 0dff61ee03f3063e23759af40f0b4b6bd26c6667.