afb70bf65e
This reverts commit 4d8fea4b2d29d89a7c3efc3eab0f0fd46cbc0645. Since the commit we are reverting didn't resolve #669, we are reverting it to fix #593 (again).