Restore code that was removed too aggressively

Change-Id: Ia1659f71e9e531c073c753a61b6ef53028749422
1 file changed