Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"

This reverts commit c23e3dd8af7397f023aae040c4a03dd14091cbed.

This speculative fix didn't fix the compile failure, do checking locally.

Change-Id: I1598f7208c8232ca38c0fcad17f211598591594e
2 files changed