Actually, this appears to fix the ios5 bug in a better way