Revert 594ce09..6083b7f

This rolls back to commit 594ce09b9b9a585b4da1c9618098092ac998a1f5.
error still exists