Revert "Final commit"

This reverts commit a1bc9b61cabce1977eb1c83ff98c0a314ac2e394.