Revert "Fixes"

This reverts commit 4578b39d763efcd64aeafd84a564fba874c4a0b1.