Revert "merge from fork"

This reverts commit b08bb11b4f8ef99db640fb1790b2296db661178d, reversing
changes made to 88ff688e982b3204a5cfbf665225bfd422c37630.