This reverts commit b4f47d2ee2. Cleanups should not be done on the release branch: that's unnecessary risk.
b4f47d2ee2