Revert ebd7f54..67a3687

This rolls back to commit ebd7f54d6b89ecd8cc8e1342a55a5f5af303ca2b.
LP

Add DPUTemplate