Fix leak from r210059

Also revert r210096 which temporarily disabled the test while this was being
investigated.