Reverted change not supported by older version of clang on TOD