I was faced with the same problem. I bit the bullet and powered through to this solution:
It was replicated by another user so it’s solid. Jeff