Revert 1287700..e9aa822

This rolls back to commit 128770028c6333e60e287a770e0829e49a44e86f.
Fix XCode5 Analyze Warning