master

I'm not sure what is going on, but for some reason this minor update is breaking our execution. Even after debugging I can't quite tell what the issue is. Best to revert for now since it wasn't critically needed change. I'll reopen the issue however.