Revert "Possible fix for errors"

This reverts commit 03b4301b331850fe2aa525825671ba704eb06c51.