Well, that was fun. This reverts commit 353d4bd4ab. Change-Id: I269c2cbb9c80f7a7841ac12fcf46b25821ce397e
353d4bd4ab