Reverting parts of previous commit
5 files changed