We can simply fix this issue by switching to our cleanup macros instead of
manually freeing the memory.

Closes #2912.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>