Revert "Finaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaal"

This reverts commit bb9b26b50cd34b07ac522e80fb8ae9ab4c67bec5.