Revert "Source: patched the rest of 3.6"

This reverts commit b702a53d98baf81d228e2900df5997d4a3295004.