This reverts commit 2be787e3. It adds the missing file from the original commit. Change-Id: Ia2c4a0f3fcc7ce1de222fa39b7fdf2ef7880468a