Fix the build on other platforms after r220865