This reverts commit a4c07502.

While this itself might not cause build issues, the related commit 90ffa89a does;
handle them together.