Revert "Fix memory leak complicated non-type template arguments."

This reverts commit ed13d8c6.

This is part of 5 commits being reverted due to https://crbug.com/1161059. See bug for repro.