Revert "Merge pull request #2893 from andersonjacob/clean2821"

This reverts commit ee422dfec2462bf7b8929cd8bacfd3a89c38430d, reversing
changes made to 34d6ba69b667771cf46e9b0159d14c5d863ad920.