I'm just going to mark my workaround as best answer as it lets me continue, though doesn't inspire a lot of confidence.
