Remove the workaround for xcode5.0