Reverting change I6deb26c1 since the core change hadn't been merged

Change-Id: I6eb6c4973f66ccd60eab6626b06d2a698a338267