Revert "Final commit"

This reverts commit a7b326d2718ac6c3f2286100bdde0a312008725c.