Revert "Commit 6"

This reverts commit 3676da890049fa6d813264fbd398100f256abe0c.