This didn't play nice with ios 6.

Will address ios 8 issue in upcoming patch.

Change-Id: I43e8412535db73829533f5fd923fa8f6b193e9fa
Merge "This didn't play nice with ios 6."