This reverts commit 204252e2df80876702616518a5154dccacf3ebac. Recommit with a fix for the leak in a unit test.
hipstdpar