Revert 1e1e8cc..620bbcb

This rolls back to commit 1e1e8ccd2b009ef9bd5b7dad4f9a4e4535694cc7.
Trying to revert back to working version…