Revert "Attempting to fix errors"

This reverts commit c14dd5b64dead5501eb1f4955e9d255cc569e521.
Revert "Revert "Attempting to fix errors""

This reverts commit 9025b2b873106c1944a166ff81cf6289c51f3a44.