Revert "merging in changes from external project"

This reverts commit 6ef235de6af6e88deff6b42915f882d1f5e102e6.