Revert "merging in changes from external project"

This reverts commit 7e823f35ade86ea2adc336863d05767653df7da1.
merging in changes from external project