Revert "merge from upstream"

This reverts commit 690d66ed9869203a2d7a71c11113095c22d99f52, reversing
changes made to d0f53c14154b52b8ea148bf24bd9284b7903baf5.