Reverted to non-heredoc version