Fails building the core image. This reverts commit 758c2f65. Change-Id: Ic3ebd8a08a3d17a513d820035b430f6de4125866