Revert "Using existing instances of tpl mixins"

This reverts commit 52cae1b4c72944f35fc0ea43b4e0459fdd3aed8f.
Tpl mixin instances, this time w/o messing up lock