Revert "merging in changes from external project"

This reverts commit 6a7007be62158ffe5013b6d814448f7517efd40c.