Revert "Fixes"

This reverts commit 723bd1e74b7a9356e0a0448030ec29c7c579ffd1.