Revert "Fixes"

This reverts commit 4bcb2827d66fbd4bf0bfe7ab95fd785eaf987303.