Revert "merging in changes from external project"

This reverts commit 3f188e1dea38964474c0dfa34a155448ab238214.