Revert last two commits pushed by  @aaroncampf, which will cause build erros.