Change was temporary. This reverts commit c2176669. Change-Id: Iaa039c166827da983f757acc168e0c0f49daec4e