Partially fixes the mess that was caused by #9681399 Change-Id: Iaabe15c87d1b002f0b2210b34adcc31b8fb4329c