Revert "merging in changes from external project"

This reverts commit e3d01f30c0a47760356a6d0bb44ebc84a6efbbdd.