Revert "Attempting to fix errors"

This reverts commit 786bc8ca051e91a7c546fd6ac0a87072420403b5.