Revert "Fixes"

This reverts commit 86a3f91af28502d06a4fd5cabf8b9e74cf776e5d.