revert previous fix for #600