Fixes some memory problems, and a previous regression.
Merge pull request #346 from wordpress-mobile/issue/memory-problems

Fixes some memory problems, and a previous regression.