These cause test build failures on Windows. This reverts the following commits: 57ca748435 d06ae33ec3
57ca748435
d06ae33ec3