Revert "Merge pull request #1142 from Gozala/bug/strip-sdk@892193"

This reverts commit cf811ad2d1f91505dfcb840c48ddb52905bfe109, reversing
changes made to 338dbdf6ef9998048744ea8ade5496a4554a9359.