Reverted change that doesn't compile on TOD