Fix that sneaky memory leak for Owain. :P

Change-Id: Ie45e37080e3dfc3a441ff0a022797b956e8e1abd