Revert "merge form upstream"

This reverts commit f6f6ed26c0822862cf17884b4924c09c1533f146, reversing
changes made to 9b7108a3f2c2b461e9d4d20e82c80c3768cc4f58.