Reverts temporary. This reverts commit 241e3474. Change-Id: I4af6b9c57e594fce407b9524f04cfa83479e16f0