Revert "Fixes"

This reverts commit 3ea604e095f1a93e9247353039c053c4edd595af.