Revert "Second attempt in fixing the IOS drawing bug"

This reverts commit d1a21f221ff953c9d109f4325214d29d780903bf.
Third attempt in fixing the IOS drawing bug