Revert "Fixes"

This reverts commit ee771c45ffad0dbc20c8c214438e0cd39b1fb6ef.