Reverted r1158146 which was causing a build failure.

2 files changed