Revert plugin thinning changes.
Merge commit '357ce75' into current
Merge pull request #720 from Juniper/current

Current