FIX: Possible memory leaks.
REVERT: Previous commit.