Reverted to using NSLog (again)
Merge pull request #2186 from alexander-mironov/master

Reverted to using NSLog (again). Fixes #2113