Backport toc without tests.