Revert "undo third party changes"

This reverts commit db29484b593ea2257452b0ccea133ef431375012.