Remove unreviewed changes intended to support GTest-based tests