Revert "Commit 5"

This reverts commit cdaf574619ed860fab8a7e08b0fd54856a421b6f.