Cleaned up a leak introduced by the prev merge