Rev. 981387d does not pass the valgrind memory leak check. The commit has been reverted but this needs further investigation.
