Revert previous patch.
19 files changed