Removed a workaround