Revert 212629247d965cccc339b976fd13daa2ade42de6

Terrible bug on iPhone