Revert "Merge branch 'server-side-includes' into testing"

This reverts commit 5fdf4a5ffd01873f83d4fe90d67650e6ef7833de, reversing
changes made to 91f9b29b3be957f23d3254302b35d9ece8d22245.