reapply de05251897345615c71202159379006043793b58 to avoid merge conflicts
fix build failure