Revert "Merge pull request #2383 from mwhite/vellum-includes"

This reverts commit 0c3538b5173dde7cc8e0cb599cb0d704722683d1, reversing
changes made to c40047725ff61828b29b476e52eea174d4d9241c.
Merge pull request #2445 from dimagi/revert-vellum-pr

Revert "Merge pull request #2383 from mwhite/vellum-includes"