Completely remove transformer deadlock workaround