Revert "Merge pull request #1141 from WaYdotNET/fix-integration"

This reverts commit 4e7c44ba339660c403e0f0782ce1b1390ce8d492, reversing
changes made to b5a455e8735be2fdaa51022a34ae62340651da16.