Rolled back last commit to twig

Revert attempt
Merge branch 'master' into twig