Fix botched refactoring

Change-Id: I02fcbfd6db7338c125a2e57ca39fc6e849d1a6b0
2 files changed