This reverts commit 179c9a549d04e50d78217c799ac83508a62d6a4e. Looks like the issue has been addressed. Fixes #483