Revert "Fix #419, cannot compile in xcode 6 beta 2"

This reverts commit c982de7e02264387f2f7d30138a55dacf596ae1a, since it causes build warnings in Xcode 5.