Revert, breaks some unknown aspect of template-table interaction