Not a great solution, but reverting back to what we had before the recent changes for this specific case.