Revert "Fixes"

This reverts commit 585057d097e1c8904c44b90af6b0d3de4fcd0264.