Working on stencils, hope this commit doesn't break anything.

This reverts commit 33c6136b935fbb6c4c66638e67b4dab66d13b0e9.