Revert "Merge branch 'Twig'"

This reverts commit 85113e1e97a2360d8cbbd761cabca9734feaf5a0, reversing
changes made to eb545a69d8eb65f541c4b36769d043699c52cb5a.