Revert "merging in upstream changes"

This reverts commit e0eb71cf1c064da2812d40e5c3279357a3c75d03.