Reverting change I10c2cbfdfa5c6d74b98d7c45e1c060911a7f20b4

This change caused bug 73255 and also broke editing in iOS 8.
Still need to figure out how to fix bug 69092 (which is somewhat
less important).

Bug: 73255
Bug: 69092
Change-Id: I20a1b26d5f5b9979d969f9c11b32fd13f2e642fd
(cherry picked from commit f6ec75457a001f3814b24ac946b6090150a4d29f)